From 5906b15c5e9c4893b151d450b4787bcab774a9d3 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Mon, 22 Feb 2016 11:29:43 +0100 Subject: [PATCH] Adwaita: avoids up pointing scale slider to jump down on hover and comment back sass debugging stuff in the process... --- gtk/theme/Adwaita/_common.scss | 5 +- gtk/theme/Adwaita/gtk-contained-dark.css | 412 +++++++++++------------ gtk/theme/Adwaita/gtk-contained.css | 412 +++++++++++------------ 3 files changed, 391 insertions(+), 438 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index fab44eb576..fe503d4333 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2595,10 +2595,10 @@ scale { @at-root %#{$marks_infix}-#{$dir_infix}, &.#{$dir_class} trough#{$nth_child} { slider { - margin: 0 1px; &#{$state} { + margin: 0 1px; $_scale_asset: 'assets/slider-#{$dir_infix}-#{$marks_infix}#{$state_infix}#{$suffix}'; - @warn $_scale_asset; // uncomment for debuggin purpose... + //@warn $_scale_asset; // uncomment for debuggin purpose... border-style: none; border-radius: 0; @@ -2611,6 +2611,7 @@ scale { margin-top: 1px; } } + @else { @if $marks_infix == 'scale-has-marks-above' { $_scale_slider_bg_pos: left bottom; } @else { $_scale_slider_bg_pos: right bottom; } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index af098e782c..9849a97f8c 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -2764,227 +2764,203 @@ scale { scale marks { color: alpha(currentColor,0.4); } scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png")); - margin-top: 1px; - background-position: top; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.horizontal trough slider:hover, scale.horizontal trough:last-child:not(:only-child) slider:hover { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png")); - margin-top: 1px; - background-position: top; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.horizontal trough slider:active, scale.horizontal trough:last-child:not(:only-child) slider:active { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png")); - margin-top: 1px; - background-position: top; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.horizontal trough slider:disabled, scale.horizontal trough:last-child:not(:only-child) slider:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png")); - margin-top: 1px; - background-position: top; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.horizontal trough slider:backdrop, scale.horizontal trough:last-child:not(:only-child) slider:backdrop { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png")); - margin-top: 1px; - background-position: top; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.horizontal trough slider:backdrop:disabled, scale.horizontal trough:last-child:not(:only-child) slider:backdrop:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png")); - margin-top: 1px; - background-position: top; - background-repeat: no-repeat; - box-shadow: none; } - scale.horizontal trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.horizontal trough:first-child:not(:only-child) slider { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-dark.png"), url("assets/slider-horz-scale-has-marks-below-dark@2.png")); - background-position: bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.horizontal trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.horizontal trough:first-child:not(:only-child) slider:hover { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover-dark.png"), url("assets/slider-horz-scale-has-marks-below-hover-dark@2.png")); - background-position: bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.horizontal trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.horizontal trough:first-child:not(:only-child) slider:active { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active-dark.png"), url("assets/slider-horz-scale-has-marks-below-active-dark@2.png")); - background-position: bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.horizontal trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.horizontal trough:first-child:not(:only-child) slider:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png")); - background-position: bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.horizontal trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.horizontal trough:first-child:not(:only-child) slider:backdrop { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png")); - background-position: bottom; - background-repeat: no-repeat; - box-shadow: none; } + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png")); + margin-top: 1px; + background-position: top; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.horizontal trough slider:hover, scale.horizontal trough:last-child:not(:only-child) slider:hover { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png")); + margin-top: 1px; + background-position: top; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.horizontal trough slider:active, scale.horizontal trough:last-child:not(:only-child) slider:active { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png")); + margin-top: 1px; + background-position: top; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.horizontal trough slider:disabled, scale.horizontal trough:last-child:not(:only-child) slider:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png")); + margin-top: 1px; + background-position: top; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.horizontal trough slider:backdrop, scale.horizontal trough:last-child:not(:only-child) slider:backdrop { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png")); + margin-top: 1px; + background-position: top; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.horizontal trough slider:backdrop:disabled, scale.horizontal trough:last-child:not(:only-child) slider:backdrop:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png")); + margin-top: 1px; + background-position: top; + background-repeat: no-repeat; + box-shadow: none; } scale.horizontal trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.horizontal trough:first-child:not(:only-child) slider:backdrop:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png")); - background-position: bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-dark.png"), url("assets/slider-vert-scale-has-marks-above-dark@2.png")); - background-position: left bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:hover, scale.vertical trough:last-child:not(:only-child) slider:hover { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover-dark.png"), url("assets/slider-vert-scale-has-marks-above-hover-dark@2.png")); - background-position: left bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:active, scale.vertical trough:last-child:not(:only-child) slider:active { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active-dark.png"), url("assets/slider-vert-scale-has-marks-above-active-dark@2.png")); - background-position: left bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:disabled, scale.vertical trough:last-child:not(:only-child) slider:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png")); - background-position: left bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:backdrop, scale.vertical trough:last-child:not(:only-child) slider:backdrop { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png")); - background-position: left bottom; - background-repeat: no-repeat; - box-shadow: none; } + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-dark.png"), url("assets/slider-horz-scale-has-marks-below-dark@2.png")); + background-position: bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.horizontal trough:first-child:not(:only-child) slider:hover { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover-dark.png"), url("assets/slider-horz-scale-has-marks-below-hover-dark@2.png")); + background-position: bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.horizontal trough:first-child:not(:only-child) slider:active { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active-dark.png"), url("assets/slider-horz-scale-has-marks-below-active-dark@2.png")); + background-position: bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.horizontal trough:first-child:not(:only-child) slider:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png")); + background-position: bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.horizontal trough:first-child:not(:only-child) slider:backdrop { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png")); + background-position: bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.horizontal trough:first-child:not(:only-child) slider:backdrop:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png")); + background-position: bottom; + background-repeat: no-repeat; + box-shadow: none; } scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:backdrop:disabled, scale.vertical trough:last-child:not(:only-child) slider:backdrop:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png")); - background-position: left bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-dark.png"), url("assets/slider-vert-scale-has-marks-below-dark@2.png")); - background-position: right bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:hover, scale.vertical trough:first-child:not(:only-child) slider:hover { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover-dark.png"), url("assets/slider-vert-scale-has-marks-below-hover-dark@2.png")); - background-position: right bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:active, scale.vertical trough:first-child:not(:only-child) slider:active { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active-dark.png"), url("assets/slider-vert-scale-has-marks-below-active-dark@2.png")); - background-position: right bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:disabled, scale.vertical trough:first-child:not(:only-child) slider:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png")); - background-position: right bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:backdrop, scale.vertical trough:first-child:not(:only-child) slider:backdrop { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png")); - background-position: right bottom; - background-repeat: no-repeat; - box-shadow: none; } + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-dark.png"), url("assets/slider-vert-scale-has-marks-above-dark@2.png")); + background-position: left bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(rtl) trough slider:hover, scale.vertical trough:last-child:not(:only-child) slider:hover { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover-dark.png"), url("assets/slider-vert-scale-has-marks-above-hover-dark@2.png")); + background-position: left bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(rtl) trough slider:active, scale.vertical trough:last-child:not(:only-child) slider:active { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active-dark.png"), url("assets/slider-vert-scale-has-marks-above-active-dark@2.png")); + background-position: left bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(rtl) trough slider:disabled, scale.vertical trough:last-child:not(:only-child) slider:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png")); + background-position: left bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(rtl) trough slider:backdrop, scale.vertical trough:last-child:not(:only-child) slider:backdrop { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png")); + background-position: left bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(rtl) trough slider:backdrop:disabled, scale.vertical trough:last-child:not(:only-child) slider:backdrop:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png")); + background-position: left bottom; + background-repeat: no-repeat; + box-shadow: none; } scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:backdrop:disabled, scale.vertical trough:first-child:not(:only-child) slider:backdrop:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png")); - background-position: right bottom; - background-repeat: no-repeat; - box-shadow: none; } + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-dark.png"), url("assets/slider-vert-scale-has-marks-below-dark@2.png")); + background-position: right bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(ltr) trough slider:hover, scale.vertical trough:first-child:not(:only-child) slider:hover { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover-dark.png"), url("assets/slider-vert-scale-has-marks-below-hover-dark@2.png")); + background-position: right bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(ltr) trough slider:active, scale.vertical trough:first-child:not(:only-child) slider:active { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active-dark.png"), url("assets/slider-vert-scale-has-marks-below-active-dark@2.png")); + background-position: right bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(ltr) trough slider:disabled, scale.vertical trough:first-child:not(:only-child) slider:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png")); + background-position: right bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(ltr) trough slider:backdrop, scale.vertical trough:first-child:not(:only-child) slider:backdrop { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png")); + background-position: right bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(ltr) trough slider:backdrop:disabled, scale.vertical trough:first-child:not(:only-child) slider:backdrop:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png")); + background-position: right bottom; + background-repeat: no-repeat; + box-shadow: none; } /***************** * Progress bars * diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index a84db8a814..1c36c13974 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -2795,227 +2795,203 @@ scale { scale marks { color: alpha(currentColor,0.4); } scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png")); - margin-top: 1px; - background-position: top; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.horizontal trough slider:hover, scale.horizontal trough:last-child:not(:only-child) slider:hover { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png")); - margin-top: 1px; - background-position: top; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.horizontal trough slider:active, scale.horizontal trough:last-child:not(:only-child) slider:active { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png")); - margin-top: 1px; - background-position: top; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.horizontal trough slider:disabled, scale.horizontal trough:last-child:not(:only-child) slider:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-insensitive@2.png")); - margin-top: 1px; - background-position: top; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.horizontal trough slider:backdrop, scale.horizontal trough:last-child:not(:only-child) slider:backdrop { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop.png"), url("assets/slider-horz-scale-has-marks-above-backdrop@2.png")); - margin-top: 1px; - background-position: top; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.horizontal trough slider:backdrop:disabled, scale.horizontal trough:last-child:not(:only-child) slider:backdrop:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png")); - margin-top: 1px; - background-position: top; - background-repeat: no-repeat; - box-shadow: none; } - scale.horizontal trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.horizontal trough:first-child:not(:only-child) slider { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below.png"), url("assets/slider-horz-scale-has-marks-below@2.png")); - background-position: bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.horizontal trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.horizontal trough:first-child:not(:only-child) slider:hover { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover.png"), url("assets/slider-horz-scale-has-marks-below-hover@2.png")); - background-position: bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.horizontal trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.horizontal trough:first-child:not(:only-child) slider:active { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active.png"), url("assets/slider-horz-scale-has-marks-below-active@2.png")); - background-position: bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.horizontal trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.horizontal trough:first-child:not(:only-child) slider:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-insensitive@2.png")); - background-position: bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.horizontal trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.horizontal trough:first-child:not(:only-child) slider:backdrop { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop.png"), url("assets/slider-horz-scale-has-marks-below-backdrop@2.png")); - background-position: bottom; - background-repeat: no-repeat; - box-shadow: none; } + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png")); + margin-top: 1px; + background-position: top; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.horizontal trough slider:hover, scale.horizontal trough:last-child:not(:only-child) slider:hover { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png")); + margin-top: 1px; + background-position: top; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.horizontal trough slider:active, scale.horizontal trough:last-child:not(:only-child) slider:active { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png")); + margin-top: 1px; + background-position: top; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.horizontal trough slider:disabled, scale.horizontal trough:last-child:not(:only-child) slider:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-insensitive@2.png")); + margin-top: 1px; + background-position: top; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.horizontal trough slider:backdrop, scale.horizontal trough:last-child:not(:only-child) slider:backdrop { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop.png"), url("assets/slider-horz-scale-has-marks-above-backdrop@2.png")); + margin-top: 1px; + background-position: top; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.horizontal trough slider:backdrop:disabled, scale.horizontal trough:last-child:not(:only-child) slider:backdrop:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png")); + margin-top: 1px; + background-position: top; + background-repeat: no-repeat; + box-shadow: none; } scale.horizontal trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.horizontal trough:first-child:not(:only-child) slider:backdrop:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png")); - background-position: bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above.png"), url("assets/slider-vert-scale-has-marks-above@2.png")); - background-position: left bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:hover, scale.vertical trough:last-child:not(:only-child) slider:hover { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover.png"), url("assets/slider-vert-scale-has-marks-above-hover@2.png")); - background-position: left bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:active, scale.vertical trough:last-child:not(:only-child) slider:active { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active.png"), url("assets/slider-vert-scale-has-marks-above-active@2.png")); - background-position: left bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:disabled, scale.vertical trough:last-child:not(:only-child) slider:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-insensitive@2.png")); - background-position: left bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:backdrop, scale.vertical trough:last-child:not(:only-child) slider:backdrop { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop.png"), url("assets/slider-vert-scale-has-marks-above-backdrop@2.png")); - background-position: left bottom; - background-repeat: no-repeat; - box-shadow: none; } + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below.png"), url("assets/slider-horz-scale-has-marks-below@2.png")); + background-position: bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.horizontal trough:first-child:not(:only-child) slider:hover { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover.png"), url("assets/slider-horz-scale-has-marks-below-hover@2.png")); + background-position: bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.horizontal trough:first-child:not(:only-child) slider:active { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active.png"), url("assets/slider-horz-scale-has-marks-below-active@2.png")); + background-position: bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.horizontal trough:first-child:not(:only-child) slider:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-insensitive@2.png")); + background-position: bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.horizontal trough:first-child:not(:only-child) slider:backdrop { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop.png"), url("assets/slider-horz-scale-has-marks-below-backdrop@2.png")); + background-position: bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.horizontal trough:first-child:not(:only-child) slider:backdrop:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png")); + background-position: bottom; + background-repeat: no-repeat; + box-shadow: none; } scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:backdrop:disabled, scale.vertical trough:last-child:not(:only-child) slider:backdrop:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png")); - background-position: left bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below.png"), url("assets/slider-vert-scale-has-marks-below@2.png")); - background-position: right bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:hover, scale.vertical trough:first-child:not(:only-child) slider:hover { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover.png"), url("assets/slider-vert-scale-has-marks-below-hover@2.png")); - background-position: right bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:active, scale.vertical trough:first-child:not(:only-child) slider:active { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active.png"), url("assets/slider-vert-scale-has-marks-below-active@2.png")); - background-position: right bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:disabled, scale.vertical trough:first-child:not(:only-child) slider:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-insensitive@2.png")); - background-position: right bottom; - background-repeat: no-repeat; - box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:backdrop, scale.vertical trough:first-child:not(:only-child) slider:backdrop { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop.png"), url("assets/slider-vert-scale-has-marks-below-backdrop@2.png")); - background-position: right bottom; - background-repeat: no-repeat; - box-shadow: none; } + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above.png"), url("assets/slider-vert-scale-has-marks-above@2.png")); + background-position: left bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(rtl) trough slider:hover, scale.vertical trough:last-child:not(:only-child) slider:hover { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover.png"), url("assets/slider-vert-scale-has-marks-above-hover@2.png")); + background-position: left bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(rtl) trough slider:active, scale.vertical trough:last-child:not(:only-child) slider:active { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active.png"), url("assets/slider-vert-scale-has-marks-above-active@2.png")); + background-position: left bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(rtl) trough slider:disabled, scale.vertical trough:last-child:not(:only-child) slider:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-insensitive@2.png")); + background-position: left bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(rtl) trough slider:backdrop, scale.vertical trough:last-child:not(:only-child) slider:backdrop { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop.png"), url("assets/slider-vert-scale-has-marks-above-backdrop@2.png")); + background-position: left bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(rtl) trough slider:backdrop:disabled, scale.vertical trough:last-child:not(:only-child) slider:backdrop:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png")); + background-position: left bottom; + background-repeat: no-repeat; + box-shadow: none; } scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { - margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:backdrop:disabled, scale.vertical trough:first-child:not(:only-child) slider:backdrop:disabled { - border-style: none; - border-radius: 0; - background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png")); - background-position: right bottom; - background-repeat: no-repeat; - box-shadow: none; } + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below.png"), url("assets/slider-vert-scale-has-marks-below@2.png")); + background-position: right bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(ltr) trough slider:hover, scale.vertical trough:first-child:not(:only-child) slider:hover { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover.png"), url("assets/slider-vert-scale-has-marks-below-hover@2.png")); + background-position: right bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(ltr) trough slider:active, scale.vertical trough:first-child:not(:only-child) slider:active { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active.png"), url("assets/slider-vert-scale-has-marks-below-active@2.png")); + background-position: right bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(ltr) trough slider:disabled, scale.vertical trough:first-child:not(:only-child) slider:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-insensitive@2.png")); + background-position: right bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(ltr) trough slider:backdrop, scale.vertical trough:first-child:not(:only-child) slider:backdrop { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop.png"), url("assets/slider-vert-scale-has-marks-below-backdrop@2.png")); + background-position: right bottom; + background-repeat: no-repeat; + box-shadow: none; } + scale.color.vertical:dir(ltr) trough slider:backdrop:disabled, scale.vertical trough:first-child:not(:only-child) slider:backdrop:disabled { + margin: 0 1px; + border-style: none; + border-radius: 0; + background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png")); + background-position: right bottom; + background-repeat: no-repeat; + box-shadow: none; } /***************** * Progress bars * -- 2.30.2